auto merge of #235 : rust-lang/cargo/better-test-output, r=alexcrichton

author bors <bors@rust-lang.org>

Tue, 22 Jul 2014 05:22:22 +0000 (05:22 +0000)

committer bors <bors@rust-lang.org>

Tue, 22 Jul 2014 05:22:22 +0000 (05:22 +0000)
author bors <bors@rust-lang.org>
Tue, 22 Jul 2014 05:22:22 +0000 (05:22 +0000)
committer bors <bors@rust-lang.org>
Tue, 22 Jul 2014 05:22:22 +0000 (05:22 +0000)
diff --cc src/cargo/util/errors.rs
Simple merge
diff --cc tests/support/mod.rs
Simple merge
author	bors <bors@rust-lang.org>
	Tue, 22 Jul 2014 05:22:22 +0000 (05:22 +0000)
committer	bors <bors@rust-lang.org>
	Tue, 22 Jul 2014 05:22:22 +0000 (05:22 +0000)
		1	2
src/cargo/util/errors.rs	patch \|	diff1 \|	diff2 \|	blob \| history
tests/support/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history